Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix HPX-APEX cmake integration #6342

Merged
merged 4 commits into from
Sep 29, 2023
Merged

Fix HPX-APEX cmake integration #6342

merged 4 commits into from
Sep 29, 2023

Conversation

srinivasyadav18
Copy link
Contributor

Existing apex cmake integration does not work for external Apex installation.

This fix seperates the git fetch installation using HPX_WITH_FETCH_APEX and external installation using Apex_ROOT, cmake variables respectively.

@srinivasyadav18
Fix HPX-APEX cmake integration
c8e7d19 
Existing apex cmake integration does not work for external Apex installation.

This fix seperates the git fetch installation using HPX_WITH_FETCH_APEX and external installation using Apex_ROOT, cmake variables respectively.
@hkaiser hkaiser added this to the 1.10.0 milestone Sep 3, 2023
hkaiser
hkaiser previously approved these changes Sep 10, 2023
View reviewed changes
Copy link
Member

@hkaiser hkaiser left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks!

@hkaiser
Copy link
Member

hkaiser commented Sep 10, 2023

This makes some of the builders fail:

@srinivasyadav18
Add -DHPX_WITH_FETCH_APEX=ON to CI builder scripts
d134581 
Add the newly introduced cmake flag -DHPX_WITH_FETCH_APEX=ON, which fetches APEX using cmake_fetch_content.
@codacy-production
Copy link

codacy-production bot commented Sep 16, 2023 •
edited
Loading

Coverage summary from Codacy

See diff coverage on Codacy

Coverage variation Diff coverage
-0.06% ∅
Coverage variation details
Coverable lines Covered lines Coverage
Common ancestor commit (2f81937) 188353 160357 85.14%
Head commit (7a505ab) 188353 (+0) 160234 (-123) 85.07% (-0.06%)

Coverage variation is the difference between the coverage for the head and common ancestor commits of the pull request branch: <coverage of head commit> - <coverage of common ancestor commit>

Diff coverage details
Coverable lines Covered lines Diff coverage
Pull request (#6342) 0 0 ∅ (not applicable)

Diff coverage is the percentage of lines that are covered by tests out of the coverable lines that the pull request added or modified: <covered lines added or modified>/<coverable lines added or modified> * 100%

See your quality gate settings    Change summary preferences

@srinivasyadav18
Fix formatting issues and add missing define
64dbe03 
Fixes cmake formatting issues.
Adds missing -DHPX_WITH_FETCH_APEX=ON
@srinivasyadav18
Copy link
Contributor Author

Details

This makes some of the builders fail:

@hkaiser I have fixed the issues. I think it is now ready to be merged. Please review it. Thank you!

@hkaiser
Copy link
Member

hkaiser commented Sep 25, 2023

@srinivasyadav18 the cmake formatting needs some touching up, still

@srinivasyadav18
Copy link
Contributor Author

@srinivasyadav18 the cmake formatting needs some touching up, still

I have just rebased the branch. That fixed the issue. Thanks!

@hkaiser
Copy link
Member

hkaiser commented Sep 29, 2023

bors merge

@bors
Copy link

bors bot commented Sep 29, 2023

Build succeeded!

The publicly hosted instance of bors-ng is deprecated and will go away soon.

If you want to self-host your own instance, instructions are here.
For more help, visit the forum.

If you want to switch to GitHub's built-in merge queue, visit their help page.

  • Bors

@bors bors bot merged commit cdc1521 into STEllAR-GROUP:master Sep 29, 2023
18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hkaiser hkaiser hkaiser left review comments

Assignees
No one assigned
Labels
category: APEX category: CMake type: compatibility issue type: enhancement
Projects
None yet
Milestone
1.10.0
Development

Successfully merging this pull request may close these issues.
2 participants
@srinivasyadav18 @hkaiser